From 5f9345d82996ddf40523fb2ee303dd79f8325457 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 28 Oct 2003 14:48:31 +0000 Subject: [PATCH] Silently do nothing when recipient is NULL, as described in the doc Tue Oct 28 09:44:16 2003 Owen Taylor * gtk/gtkxembed.c (_gtk_xembed_send_focus_message): Silently do nothing when recipient is NULL, as described in the doc comment. (#123107, Thomas Leonard) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkxembed.c | 7 +++++-- 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b26f4e42b7..81db898015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Oct 28 09:44:16 2003 Owen Taylor + + * gtk/gtkxembed.c (_gtk_xembed_send_focus_message): Silently + do nothing when recipient is NULL, as described in the + doc comment. (#123107, Thomas Leonard) + Tue Oct 28 09:21:29 2003 Owen Taylor * gtk/gtkmain.c (gtk_check_version): Move docs inline, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b26f4e42b7..81db898015 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Oct 28 09:44:16 2003 Owen Taylor + + * gtk/gtkxembed.c (_gtk_xembed_send_focus_message): Silently + do nothing when recipient is NULL, as described in the + doc comment. (#123107, Thomas Leonard) + Tue Oct 28 09:21:29 2003 Owen Taylor * gtk/gtkmain.c (gtk_check_version): Move docs inline, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b26f4e42b7..81db898015 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Oct 28 09:44:16 2003 Owen Taylor + + * gtk/gtkxembed.c (_gtk_xembed_send_focus_message): Silently + do nothing when recipient is NULL, as described in the + doc comment. (#123107, Thomas Leonard) + Tue Oct 28 09:21:29 2003 Owen Taylor * gtk/gtkmain.c (gtk_check_version): Move docs inline, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b26f4e42b7..81db898015 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Oct 28 09:44:16 2003 Owen Taylor + + * gtk/gtkxembed.c (_gtk_xembed_send_focus_message): Silently + do nothing when recipient is NULL, as described in the + doc comment. (#123107, Thomas Leonard) + Tue Oct 28 09:21:29 2003 Owen Taylor * gtk/gtkmain.c (gtk_check_version): Move docs inline, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b26f4e42b7..81db898015 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Oct 28 09:44:16 2003 Owen Taylor + + * gtk/gtkxembed.c (_gtk_xembed_send_focus_message): Silently + do nothing when recipient is NULL, as described in the + doc comment. (#123107, Thomas Leonard) + Tue Oct 28 09:21:29 2003 Owen Taylor * gtk/gtkmain.c (gtk_check_version): Move docs inline, diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c index bc1f5dfa2b..1c01fbb684 100644 --- a/gtk/gtkxembed.c +++ b/gtk/gtkxembed.c @@ -122,7 +122,7 @@ gtk_xembed_get_time (void) /** * _gtk_xembed_send_message: * @recipient: window to which to send the window, or %NULL - * in which case nothing wil be sent + * in which case nothing will be sent * @message: type of message * @detail: detail field of message * @data1: data1 field of message @@ -170,7 +170,7 @@ _gtk_xembed_send_message (GdkWindow *recipient, /** * _gtk_xembed_send_focus_message: * @recipient: window to which to send the window, or %NULL - * in which case nothing wil be sent + * in which case nothing will be sent * @message: type of message * @detail: detail field of message * @@ -184,6 +184,9 @@ _gtk_xembed_send_focus_message (GdkWindow *recipient, glong detail) { gulong flags = 0; + + if (!recipient) + return; g_return_if_fail (GDK_IS_WINDOW (recipient)); g_return_if_fail (message == XEMBED_FOCUS_IN || -- 2.30.2